kernel: update to latest version for series 5.10, 5.15, 6.1 #3708
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rebase to Amazon Linux upstream version 5.10.205-195.804.amzn2. Signed-off-by: Markus Boehme <[email protected]>
Rebase to Amazon Linux upstream version 5.15.145-95.156.amzn2. Signed-off-by: Markus Boehme <[email protected]>
Rebase to Amazon Linux upstream version 6.1.66-93.164.amzn2023. Signed-off-by: Markus Boehme <[email protected]>
The recent update to the 5.10 kernel picked up a bunch of Mellanox network drivers from the Amazon Linux kernel. We don't need those, so deactivate them again. Signed-off-by: Markus Boehme <[email protected]>
Commit b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
in the upstream kernel introduced a regression where kprobes cannot be
created on functions residing in loadable modules if the probe location
is identified by an unqualified function name.
The faulty commit was backported to the 5.15, but a backport of the fix
is not yet available. Carry the fix here for release preparation and
seek resolution upstream as soon as possible. This may mean upstreaming,
or reverting the faulty commit entirely (sentiment for the faulty commit
has soured, and it has been yanked already from patch queues for older
stable series).
Signed-off-by: Markus Boehme <[email protected]>
|
Cancelled the workflows while I'm updating the look-aside cache. |
bcressey
approved these changes
Jan 11, 2024
yeazelm
approved these changes
Jan 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Update kernels to latest AL kernels available in the repositories. Massage the configuration for the 5.10 kernel to be closer to the state we had before the update. Add a fix for #3691 to the 5.15 series, since its update picks up the buggy commit (this is a downstream backport since none is publicly available yet; to be upstreamed; backport could be simplified a bit compared to #3699 due to the existing backport of the bug already bringing enough helpers).
Testing done:
Validate basic functionality through sonobuoy quick test:
Changes to the configs as reported by
tools/diff-kernel-config:The full diff-report can be found on Gist.
The changed configuration in the 5.10 kernel on aarch64 boils down to two groups:
DRM_QXL: Removed the driver for a virtualized GPU used in remote desktop scenarios. It's no longer supported by Amazon Linux. Nothing of value is lost for Bottlerocket's scenario.MLX4and friends: Dropping the drivers for 4th gen Mellanox NICs. Those are only relevant in bare metal scenarios. Amazon Linux enabled those drivers for x86_64 as well (they were already enabled for aarch64) to reach parity. However, for Bottlerocket the reverse makes more sense: We don't support aarch64 on bare metal (and not with the 5.10 kernel), and ship drivers for the 5th gen Mellanox NICs instead.The backport for #3691 I tested via aws-k8s-1.27 on x86_64. I verified that probes can be placed on symbols defined in loadable modules (via qualified and unqualified names, using
nf_nat_packetandnf_nat:nf_nat_packet, respectively), and that ambiguous probe definitions are still rejected (usingkzalloc):Terms of contribution"
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.